Composition over inheritance
refactor tests to new composition
Server-side tests for user editing