Tests now passing, bitches. :)