bugfix, +more tests