refactored tests and corrected jquery selector bug
resolved conflict