updated tests, needs comments