Fixes and add test folder