Tests and some model adjustments