Setting up the testing... this is a big fix I guess