Fixed broken unit tests

For Issue #195

Please view using the nowhitepspace flag. ?w=1 as I messed up and Eclipse applied standard whitespacing, and added final to final inputs. Apologies on that one, will be more careful going forward.

Still, tests don't all run outside of Eclipse. Still need to figure out how to correct this.