added 10 or so more tests