Fixed Test Suite, all passing