added validations and made test pass, also commented out time dependant tests