Added more validator annotations and tests
Added new tests and fixed bugs found