Small fixes to few spec tests