WIP - use long in unittest