Fixed tests
Changed front end