Test cleanup and minor refactorings.
Add note about pending test.
User can add new category and/or new subject