Model cleanup
Removed a load of useless tests