Resolves #74 More tests are needed in order to prove functioning of renewed core
Also removed useless whitespaces.