cleaned up PC setup and test code