Put resources in 'resources', fix methods and test