Re-factored test system to be independent
Updated for changes to peacockError and testing