Bug Fix: updates, added fixed bug in tests