indentation fixes and unit test updates