Cleaned up Test Script, and seperated plotting