added more testing and some fixtures