Improved test coverage in front end