Fixed: uncomment tests