Cleaned up code and continuing with test assertions