Hacky unitest fix...