* Used mocks to test if methods are colled * Increased coverage * Removed duplication and excess verbage
