Write 2NF and tests