Add tests for toolbar surround logic

• add junit dependency for parameterized tests

Note: you might have to rebuild gradle dependencies to get this to work