Merged in test, added test to test suite