test environment working; minnor changes on models