Resolved some test issues