fixed tests, left one pending implementation