Code review. Split tests up