Java 8
Fixed category deletion
Test updates