Cleaned up tests to be rails4 and testing helpers