Making tests passable when bug is fixed