alter w/tests
update progress
bugfixed tests