added some more tests
removed the 'ugly' dropdown and made something a bit nicer looking