Added specific tests for the added types and javadoc