Simple tests added

Lots of formatting changes, deleted whitespace.   Have a