Fixed incorrect import calls and some old testing errors