Fix test, remove unused, tidy quotes and brackets