Correcting tests to fit new code. Adding on test