Update tests + fixes #174