Adds some tests and a new File class