fixed tests and final updates