Removed submodules and changed the way testing is done