Implemented mock data functionality in unit testing. Cleaned up methods