Multiple fixes; All tests are now passing