Fixes test names and improves coverage