More tests, file read functionality added