Add tests and remove level data map