#16 - modified model and fixed all tests to include environment inside request