Fixed tests and docs