Add includes to test, fixes tests