Move to own namespace
Create separate test