Moar tests, for great justice!

Change-Id: I29b541b4790ba5dadba9ce44e406c1d936883a2d