Tests and dependencies errors fixed