got all but last test to work