Added Category class and Categories table, added more testing