Adding tests for all this new type stuff