Add test data, fix levels calculations