* Tests fixed