Use dot notation, tighten sample tests