More tests, fixes for issues they found
More tests