Cleaned up Unit Tests

Cleaned up the unit tests: removed repetition, made it easier to edit tests, cleaned up variable names.