Still working on the Unit Tests