Cleanup - removed tests + refactoring in refreshRate setter