Added another diagnostic and test, also fixed alginment in testsuite.