Fixes to tests and added label to header