Tuning of tests, first catalyst tests added, lots of warnings ;)