Buffed out tests, created methods in CC for implementation