Some cleanup and added a test for bossy data

Cleanup previous tests and add specs for bossy data.