Improved testing, documented manual testing