More work on test library, not working yet