Many tests are now expanded and working