(tests) Some refactoring

tests method renamed
stub files tree rearranged
added some junit assertions