Even more fixes to static (lazyness)
Additional tests