Method tests

Make sure the file structure is still in tact, I moved some stuff around.