Added simple types + better tests.