Unit testing

Cleaned up tests, let's start fresh