Fixing tests and enhancing swipe