use two tests instead of one
fix tests