Fixed many tests, increased coverage