Corrected some includes that made some tests not work