Updated models + testing app