Make Tests nicer