Minor cleanup, start with tests now
Starting with tests
Fixed tests and added a few