fixed some tests and select2