added BAOs
Generated test classes