working on some tests