Updated the version of easymock and junit
Fixed the captures in the test for newer easymock
Fixes to tests so that they use the new JUnit annotations. The biggest
problem was in isolating dependencies through tests in the same class.
Tests SHOULD NOT assume an order of execution!
Updated IntelliJ project files
Merge branch 'feature/test-libs-update' into develop
Merge pull request #132 from adamretter/develop

Fixed test isolation problems and updated test libs