Bureks are now repalced with actuall translation calls
Added base for tests, refactored code a bit