Improved some tests