Completed and reorganized first wave of specs; changed test port to 3001