Cleaned up code. Added additional test cases. Upgraded JMH.