Add tests and styling