fix tests, test before & after