Fixed broken tests, added new, disabled not ready
Fixed broken value
Fixed another broken test
Some more tests