More tests, keep instance support for emitted code