Implemented remaining unit tests