Starting to get more tests going for comparison

Seems OK, going to implement the rest now