Made previous tests more strict