Move select to object, unit tests