Fixes for Unit Tests and Whitespace