Rename to make them look better
Add test script