Add more specs
Use select instead of awful polling
Bump version for select change