Add Tests and CLI