Move Testing
Add tests