made a few tests more specific and added a data class for initialization