Added remaining unit tests