Added additional types and tests
Testing sucks
Added tests for additional types