Tests

Adds more unit tests