Few fixes to spinach tests