renamed stuff and removed uncessary properties testing