updated fixed tests and added others