Updated testing and docs