cleanup & test fixup
Merge branch 'master' of https://github.com/IdeaBlade/Breeze