Improved the LOCK tests
Fixed the REPORT system tests