Improve test coverage and further use AS