fix tests. more tests still needed..