Working tests (updates #286)
Merge pull request #287 from ZeusWPI/feature/286/tests

Working tests (updates #286)