Slightly improved tests, looking to find permanent fix for select2 dependancy'