sorted out quite a few tests