Working on enabeling the remaning tests and code