Added Tests from maxxb