Unit Tests

- Modified tests to include a terminator, to resolve ambiguity.