Fixed tests, addressed most of Brian's feedback