Removed some testmodel code from the main imtables file