updated tests, not working yet