better-er testing :D
minor adds