Got tests to a better state
More tests yay\!