fixing tests
asd
merged
merge
registration business logic works