added in tests, they are currently failing