Bug fixes, tests fixes