Changed some file stuff, made tests better