Fixed unit tests and added support for tagged reads