Added extra methods and cleanup of testing
1.0.1