Moved test files into /test folder
Added a couple test files