Fixed all tests and code to pass after prior modifications