Fixed tests and added in coverage support