Clean up tests

Someone can review this and double check I didn't break anything and then pull.