Replaced Java 7 functionality using Wicket util libraries.
Fixed broken tests.