formatting
add test cases for all the units

remove data helper in test
reword a few specs