Adding tests for utilities