Change table names and take care of some code coverage issues