Refined a few tests. They still need work though.