Refactor: Make output routines passable from outside
Add tests for various Measurement methods