Fixed #36, BTS_TEST_NETWORK macro usage
merge upstream develop