Added all working tests.
Tried to get some nicer compact formatting.