removed lazy properties as they were casuing a race condition crash and fixed up tests