added spec tests back and fixed rise and set times