Cleaning up headers.
Added tests