Improved build
Changed test