Restructured, more tests