Adding tests, working on validation