Updated tests (must refactor them anyway)