Issue created mostly to capture remainder work from the https://issues.jboss.org/browse/AEROGEAR-2336 spike.

At the time of creation, only updating the existing unit tests was required.