First attempt at names fix, tests commented out