Added validation unit tests