[done] acceptance tests + fixes found on tests