J: Tests fixed