Fixed remaining integration issues; the test cases need to be run in a specific order.