Mostly adding tests