Update select and fill out unit tests