Changed file names, updated tests