To maven


Fix for some of the test errors