Added test folder and moved test there