Separate and better tests