Updated docs, minor bug fix
Fixing test files
Updated docs