Adds tests and ability to read