bugs + tests