Cleaned up MACROs; added bitlock tests