add resources and improve testing