fixed tests and specs