Added general measurement methods and tests