adding tests and styling