Adds tests for improved coverage