Added unit tests and test fixtures