Move to Junit 4.11 and hamcrest-lib 1.3 so we can do better tests
Fix timestamp related test failure

Due to Timestamp not properly overloading after(Date).

See issue #1 for preferred solution