Refactored plx, added test data