fixed broken unit tests and nuked old ones
added additional tests