Clean up tests

Cleaning up test some. Still getting use to go.