Better test organization and add coverage feature