Bug Fix: OBANYC-2174 and OBANYC-2199. Added new integration tests to
TestSuite.java so that they can be run.