Added unit tests for general measurements