Fixed failing tests and feature test