Updated test for Boris version & removed extra hoc code generation