Fixed stuff from/for testing