*fixed tests so that the order does not matter.
*small fixes all over.