Implement rest of the unit tests