Fiiiiiix
Add credits
More test improvements.