Fixes test structure, fixes some test issues.