Big changes to get rid of rake tests. Testing methods instead.