Implementing the rest of the test