Added more relevant metadata and fixed tests and docs