Full fix test model

[Closes #2]