Removing logic from tests and adding hard coded results