added test and some stuff