fix tests and add all goals tests