started adding testing
Fixed nereus timezone issue