Removed non-related test code & data
Re-added proper functionality
Added missing dependencies