Made tests clarer, took a poke around.