started adding tests...