bottles support
added extra test coverage for new features