refactored tests, other tests failing