move helpers to bottom
remove reduntant asserts
Clean up repo tests