Modified tests to adapt for new changes incorporated