fixed tests
fixed references