merging hover bar with hover bar tests and test refactor
merge hover bar and hover bar tests