worked on a few tests