fixed tests and integrated test suite