Address @7andrew7's comments
Unit test of the year, easter :egg: