Fixing more access checks, started fixing tests