More testing and docs