Code for review - Tests

Please check out the setup so far