Basic Tests

These tests were provided by the boiler plate, just adjusted them a bit
to work for our version