fix tests, add new