Updated tests to be run as part of the build