Altered and added unit tests