Added in javadoc, basic controller tests