(#30) - rewrite tests to (almost) exclusivly use promises