cleaned up, fixed test scripts