Cleaning up unit tests to perform actual action instead of mocking