[BV-Fixed some test structure and refactored tests.]