clearing up tests

fixing english contractions

cleaning up rebase