better fix for unit tests not always firing