Move tests to correct packages
Use beter access modifiers for tasks