moves some things around. Add two more sample tests