More gen enhancements plus a couple test cases