Tests added, work now.