updated taxonomy, added data fixtures