Beta 6: Testing Cleanup