FORGE-807: Moved tests to TypesTest in parser-java
Minor refactor to Types