add proper tests and fix bundler