Added tests for more pc's