fixed tests and build