Unit tests execution order causing fails on JDK7 / Win

Fix for #219. Refactored various non-private non-final static variables that caused unit tests to fail due to execution order.
Also contains additional clean ups of non-private non-final static variables that didn't directly cause the tests to fail but that weren't needed to be non-final or static.