Added a few tests and fixed an issue with incorrect class name in Code Gen