Remove useless tests folder
Check for required args
Use proper deferred returns
Add initial tests