refactored tests a bit
send personal email in 3 days