Added working unit tests