Fleshed out the tests and added further assertions