made some tests, needs cleanup