Removed inline require, Add tests