Adds missing tests and fixes fraudulent option