fixed integration bug, will finish writing actual tests tomorrow