Adding tests for additional coverage