Updated tests, fixed LazyLoad bug