Make aliases apply immediately. More tests