Refactor tests
Add numericality validation