Restructured tests, added availability