All tests now pass...yeeppppeee