Adding more tests, changing validation fields