cleaned up tests a bit, updated results