Removing Turn model and fixing tests