fixed tests
rebuild