Added category functional tests (bug 851614)