Fixing last bugs and adding tests