Added better tests