EDX-423: Add tests