MOB-311 Cleaned up code and fixed correlated tests. Added position settings to config to avoid having configurable numbers in the application.