Fixes tests and re-configured all input validation