Cleaned up Select tests