Joe Van Loon Tests

Unit and acceptence tests.