Added stubs, tests for remaining types