Multiple fixes for tests not being able to run and fixes for broken and old tests

Fixed CONFIG, now it's more modular. #70 
Fixed broken tests by popover (unassigned task - #63)
Removing unused code. Fixing tests. #70