Quixey - wrote better tests, fixed small bugs surfaced from testing