Cleanup tests

 throws IOException as well in javadoc?