Remove test stuff
Rename functions