Fixed x models and added tests for them