fixed tests - missing some still