Add Tests and Analytics