Refactored for test release
Error traps and remove stale pass information