Some cleanup and added a test for bossy data