required tests started + minor bug fixes
merged conflicts