Added bubble tests + test refactoring