Tests enabled and fixed