WIP
More tests
apps folders
WIP on tests