fixed test, removed accidentally merged file