Cleaned up tests and README