changed tests; cleaned up code
Updated script; Added cache