Added fixes again to at least enumerate on USB and almost do tests