Add tests for new classes. Fix old tests. Fix bugs
Add branch alias