fix tests and get rid of global for options