Added testing
Fixed naming problem
Added method for direct file read
A few tweaks