started fixing tests, will move to dev to finish