fixed tests and added pending tests