Tests, functions on Object, comment reaordering and other stuff